switch some builds to Qt 6.5.1 (#1119)

* update some builds to Qt 6.5.1

* conditional code for QVersionNumber evolution

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index ba7eee630b7d479df2175bd23e8485fdb13c0f6c..39bd2881c069e329f1a92544d237167aece3378a 100644 (file)
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -33,7 +33,7 @@ jobs:
             GENERATOR: 'Ninja'
             RELEASE: true
             os: macos-12
-          - QT_VERSION: '6.5.0'
+          - QT_VERSION: '6.5.1'
             XCODE_VERSION: '14.2'
             GENERATOR: 'Ninja'
             RELEASE: false

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 3eb338be2df0aeabd74c84b2141739433d29fb7c..b7519ce66c8c30a9fb669197ed82826db48d5a44 100644 (file)
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -60,7 +60,7 @@ jobs:
             GENERATOR: 'Visual Studio 17 2022'
             RELEASE: false
             os: windows-latest
-          - QT_VERSION: '6.2.4'
+          - QT_VERSION: '6.5.1'
             ARCH: 'amd64'
             HOST_ARCH: 'amd64'
             COMPILER: 'msvc2019_64'

diff --git a/gui/upgrade.cc b/gui/upgrade.cc
index b17f67270729b0820732bcbe4a61babfdf7786ff..73211c4cf279cb1e8c99a7b79abd4f60b54b1de4 100644 (file)
--- a/gui/upgrade.cc
+++ b/gui/upgrade.cc
@@ -20,27 +20,29 @@
  */
 
 #include "upgrade.h"
-#include <qglobal.h>                        // for qDebug
-#include <QByteArray>                       // for QByteArray
-#include <QDebug>                           // for QDebug
-#include <QLocale>                          // for QLocale
-#include <QSysInfo>                         // for QSysInfo
-#include <QUrl>                             // for QUrl
-#include <QVariant>                         // for QVariant
-#include <QVersionNumber>                   // for QVersionNumber, operator<, operator==
-#include <Qt>                               // for ISODate, RichText
-#include <QDesktopServices>                 // for QDesktopServices
-#include <QNetworkAccessManager>            // for QNetworkAccessManager
-#include <QNetworkReply>                    // for QNetworkReply, QNetworkReply::NoError
-#include <QNetworkRequest>                  // for QNetworkRequest, QNetworkRequest::ContentTypeHeader, QNetworkRequest::HttpReasonPhraseAttribute, QNetworkRequest::HttpStatusCodeAttribute, QNetworkRequest::NoLessSafeRedirectPolicy, QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::Redi...
-#include <QMessageBox>                      // for QMessageBox, QMessageBox::Yes, operator|, QMessageBox::No
-#include <QtXml/QDomDocument>               // for QDomDocument
-#include <QtXml/QDomElement>                // for QDomElement
-#include <QtXml/QDomNode>                   // for QDomNode
-#include <QtXml/QDomNodeList>               // for QDomNodeList
-#include "gbversion.h"                      // for VERSION
-#include "babeldata.h"                      // for BabelData
-#include "format.h"                         // for Format
+
+#include <QByteArray>             // for QByteArray
+#include <QDebug>                 // for QDebug
+#include <QDesktopServices>       // for QDesktopServices
+#include <QDomDocument>           // for QDomDocument
+#include <QDomElement>            // for QDomElement
+#include <QDomNode>               // for QDomNode
+#include <QDomNodeList>           // for QDomNodeList
+#include <QLocale>                // for QLocale
+#include <QMessageBox>            // for QMessageBox, QMessageBox::Yes, operator|, QMessageBox::No
+#include <QNetworkAccessManager>  // for QNetworkAccessManager
+#include <QNetworkReply>          // for QNetworkReply, QNetworkReply::NoError
+#include <QNetworkRequest>        // for QNetworkRequest, QNetworkRequest::ContentTypeHeader, QNetworkRequest::HttpReasonPhraseAttribute, QNetworkRequest::HttpStatusCodeAttribute, QNetworkRequest::NoLessSafeRedirectPolicy, QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::RedirectionTar...
+#include <QSysInfo>               // for QSysInfo
+#include <QUrl>                   // for QUrl
+#include <QVariant>               // for QVariant, operator!=
+#include <QVersionNumber>         // for QVersionNumber, operator<, operator==
+#include <Qt>                     // for ISODate, RichText
+#include <QtGlobal>               // for qDebug, qsizetype, QT_VERSION, QT_VERSION_CHECK
+
+#include "babeldata.h"            // for BabelData
+#include "format.h"               // for Format
+#include "gbversion.h"            // for VERSION
 
 
 #if 0
@@ -170,8 +172,13 @@ UpgradeCheck::updateStatus UpgradeCheck::getStatus()
 // this function to sort that out. (See what I did there? Bwaaaahah!)
 bool UpgradeCheck::suggestUpgrade(const QString& from, const QString& to)
 {
+#if (QT_VERSION < QT_VERSION_CHECK(6, 4, 0))
   int fromIndex = 0;
   int toIndex = 0;
+#else
+  qsizetype fromIndex = 0;
+  qsizetype toIndex = 0;
+#endif
   QVersionNumber fromVersion  = QVersionNumber::fromString(from, &fromIndex);
   QVersionNumber toVersion  = QVersionNumber::fromString(to, &toIndex);
 

diff --git a/tools/ci_install_qt.sh b/tools/ci_install_qt.sh
index f56dfc2518862be698103d13ba3b76a106e4c3a0..611aeb2917969f3bfe1cea7322ccfcb06d9f5ddf 100755 (executable)
--- a/tools/ci_install_qt.sh
+++ b/tools/ci_install_qt.sh
@@ -22,6 +22,7 @@ qtdatavis3d \
 qtlottie \
 qtnetworkauth \
 qtquick3d \
+qtquick3dphysics \
 qtquicktimeline \
 qtwebglplugin \
 qtshadertools \